From: Miles Bader <miles@gnu.org>
Date: Tue, 8 May 2007 02:07:17 +0000 (+0000)
Subject: Merge from emacs--rel--22
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18920
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=ccea302421c809e83e87f676f8c5ab8ed3f51af4;p=emacs.git

Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 11)

   - Update from CVS

2007-05-08  David Reitter  <david.reitter@gmail.com>

   * lisp/progmodes/python.el (python-guess-indent): Check non-nullness
   before comparing indent against the 2..8 interval.

2007-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>

   * src/editfns.c (Ftranspose_regions): Yet another int/Lisp_Object mixup
     (YAILOM)

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-736
---

ccea302421c809e83e87f676f8c5ab8ed3f51af4
diff --cc src/ChangeLog
index 42580d80746,b65e51b545b..ab3c9188b52
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,11 -1,17 +1,15 @@@
+ 2007-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+ 	* editfns.c (Ftranspose_regions): Yet another int/Lisp_Object mixup (YAILOM)
+ 
 -2007-05-06  Richard Stallman  <rms@gnu.org>
 +2007-05-07  Andreas Schwab  <schwab@suse.de>
  
 -	* process.c: Undo May 3 change.
 +	* keymap.c (Flookup_key): Fix typo in last change. 
  
 -2007-05-03  Per Cederqvist  <ceder@lysator.liu.se>  (tiny change)
 +2007-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
  
 -	* process.c (Faccept_process_output): Revert 2006-03-22 change so
 -	that the third argument once again is in microseconds (not
 -	milliseconds).  This makes it compatible with Emacs 21 and
 -	earlier.  Problem found by Henrik Rindl,Av(Bw.
 +	* keymap.c (Fdefine_key, Flookup_key): Only do the 0x80->meta_modifier
 +	mapping for unibyte strings.
  
  2007-05-01  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>